Intercept compat test deprecation warning

Don't need it cluttering up the test output
Fix compat deprecation warning test

Last update broke it
Merge branch 'master' into geezer