Utils Improvements and Tests

:hammer: