Make selection tests pass