Code coverage related fixes