Moved test.h and util.h into their own library