Upgrading to XCTest. Removing some warnings.