Added some more tests for the utils