More code coverage updates