Update to new XCTest expectations, not using the accuratly but will have to do for now until rewriting tests.
Update from NSObject to id