Made the tests pass
Merge pull request #122 from kaspergrubbe/master

Made more tests green