Merge "Add the keyword "Test" to some test class names"