restored @Test annotation in SimpleValidateQueryTests