improved finding of tests