Fix failing spec tests
Merge pull request #27 from jwennerberg/fix_spec

Fix failing spec tests