Hamcrest update
Switched to ARC
OCUnit -> XCTest