Clean up Utils a little
Add unit tests for Utils
Remove unused methods in Utils