Simplified selection of tests

____