Fix/extend spec tests
Merge pull request #10 from jurgendb/master

Fix/extend spec tests