Incremental progress updating tests after refactor