Bug 909017 - Fix test-coverage incompatible unit test

These changes will fix the fails in blanket coverage report.