will rebase: tests pass (and fail without change)