lcov support working - tidy up