t5: added tests to form validation
fix merge conficts