6.5 Switch to TestProbe