Update to XCTest and OCHamcrest 3