Merge "Add a word "Test" to metering test classes"