Fix style, more tests, FilteredSuite => PrunedFilteredSuite