Remove obsolete calls to set()
Improve specs
Merge pull request #17 from laurens/remove-obsolete-set

Remove obsolete calls to set()