Fix 3.4 only test issues