Code coverage and test fix