Alternatively, you could simplify a lot of the changes by just recreating the category methods in a new class only included in the XCTest package.