Add tests for util class