Upgraded to using XCTest framework