tests needed to change back to expecting 2.6.1-like behavior.
sure that nothing breaks again once a bug in closed.