Fix spec
I've tested this by hand and it will take us some effort to get rid of the excessive mocking I wrote