Fix specs

Sorry I just realised I wrote these specs I thought you had :). I think it's best to scrap them and start again with what you've mentioned.