Improving the test suite, improving code coverage #51