Rename tests and update their @covers tags to match earlier rename in pr...

...oduction code