Cleanup and fix tests broken to bad stubbing.