Add secondary selection unit tests