Moar spec fixes

Some small spec fixes. 

I'm working up to something worthwhile here :smile: