Added test for two utils classes and small refactoring in other classes