Speccing the shit out of these mocks
Merge pull request #20 from danielhfrank/fix_mocks

fix basically every mock in tests :X