Simplified selection of tests

____

Simplified selection of tests