Merge "Add 'Negative' to negative test class names"