Fixing up Unit Test failures due to old-style @covers tags