Remove dependency on spies