Adding tests for new selection process