Refactor unit test, code maintainability and readability policing