Implement changes in the tests due to the utils spliting, OrionSink common parts review, etc