Code coverage fixes