Updated tests to include validations