Comments, tests refactoring