Upgraded tests to XCTest, all tests passing