Code Coverage measure fixes