Added 2 more tests directly to the util function