Fast version of OC selection
Undoing previous change: no performance fix
Reworking the tests a little more for FASTER
Some more minor refactoring