Fixing failings of spec

I have done it.