Test fix
Convert selector tests to JUnit 4