Adds some forgotten specs etc.
All the specs.
Merge branch 'some-forgotten-work'
pick b974ae5 All the specs.