Fixing failings of spec