v1.0.x: refactor utils and tests