Added some more tests, confused over the test calculation though
Added some more comments in an attempt to explain the test counts
Merge pull request #19 from jonasbn/master

Adjusting failing test