Remove redundant "filter" method from collection categories
Switch to XCTest for unit tests