convert to XCTest

self-merging