Fix spec tests
Merge pull request #17 from dieterdemeyer/master

Fix spec tests
Incorporate spec fixes from @dieterdemeyer