Remove logging fallback import
Fixup test refactor