all tests pass with new rework