Added more tests, got pylint score above 9.0