Merge "More Unit Tests for utils module"