Merge "Junits for classes in util package"