Updated classes used in code coverage reports