Updated tests to use XCTest