Increase test coverage

Looking at coveralls.io, I decided to add tests for a few of the missing cases. Don’t know if it makes sense to merge or not…