Fixed hpc test coverage