Updated tests to use new validation types