Move form tests to separate file
Clean up with flake8