Cleaned up the test code
Adjusted pylint rules