Updated tests and both validators