Add more tests for Util

Test Plan:
- Run tests