Fixed code coverage - has to come before test stuff.