more stuff that was missing and fixed util test