Test setup fixes
Compatibility with flux