improving utils :rage1:
fixing tests :rage1: