I'm fairly lenient about it, but since you'll be rebasing, please consider Henri's suggestions.
I feel similarly, especially when it comes to test, but I think I agree with most of that.
I don't mind the switch in tests on principle, but in this case it doesn't seem to be doing anything, since the only meaningfully shared code is the clear and probe, so it probably makes more sense just to write it all out linearly.