Add tests for util methods