Fixed code coverage issues