fix tests (now util is no longer directly imported)