Fixed code coverage reporting and cleanup

Change-Id: I65566f0e52b405baa23bb86af734b90e4237f616