Make the util a class instead - this should hopefully make some of the tests a little easier to write