Added unit more tests for util functions