Making Utils abstract and updating the tests accordingly.