Cleaned tests file to correct all pyflakes and pep8 errors

I think "that the form" is better than the slightly ambiguous "that form", but I can live.