Utils Improvements and Tests

:8ball: