Remove fluff and fix the deprecated test warning
Fix merge conflict