Cleaned tests file to correct all pyflakes and pep8 errors

Makes reasonable sense :)