More modifications to make code cov run on a branch