pyLint refactoring
Update unit tests