Improving code coverage

Sorry, that got kind of shameful.