Fix a missing require and tests that broke under 3.4