Moved Utils into one object for single referencing. Adjusted tests.