Fix failing spec tests
Merge pull request #11 from jwennerberg/fix_spec_tests

Fix failing spec tests