Cleaned tests file to correct all pyflakes and pep8 errors

+1 to simplicity