Switching to single implementation test file, consistent with the new XCTest framework.