Merge "Add unit tests to Utils"