Convert tests to XCTest
Convert tests to XCTest