Other half of code-coverage PR