Fixed spec
More spec fixing