Make validation more intuitive
Update tests to reflect new validation behaviour