changed filtering so that permutations of tests can be run