Clean up source to meet pep8 standards
Fixed tests so that they will now run properly