Add tests for the reloading cases broken by 2.x → 3.x transition