Contracts becoming closer to final, extended ObjectSvc, changed mocks to spies