change to filter tests, got rid of some steps that were not needed