MP-435 #comment check in test files, update forms' required fields