fixing tests, actually putting utils in util package