Fixed SomeValidator and Tests