This should now get Travis going, with a full migration to XCTest