Some tests before used lib change
Some minor changes
After refactoring
.