Code Coverage improved