add tests for util
fix this nonsense