Reworked some more of the selector tests as well to clean up after themselves.