Merge "Fix code coverage definitions for the test-runner tests."