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

This reverts commit 1244488e027405ef88779747d4a635607179dc2e.
Added test for two utils classes and small refactoring in other classes