Added code coverage support