enabling a couple more tests (that don't work), and annotating sites to fix in the component-selection module