Fixed test metrics and increased coverage