Update tests and try aagain with new util lib