Fixed NSUInteger references
Updated to XCTest