Deleting unnecessary Util classes and write new unit tests