Added more unit tests for util functions