Fix coverage tests to report proper coverage