The last changes make the utils directory not useful anymore.
Finished porting the new test.