cleans up and adds tests to selection pages