Improve testForms