WIP
Move to XCTest