- rename Utils -> Util
- test for Util