Tightening up code coverage