Doing a better job at stubbingg and restoring methods