Clean up Selector tests
Clean up Selector tests

Reorganise test code to be a bit more readable.

NeilFraser/CodeCity,google/CodeCity,google/CodeCity,google/CodeCity,NeilFraser/CodeCity,NeilFraser/CodeCity,google/CodeCity,NeilFraser/CodeCity