Correct location of selection tests, remove redundant tests