Local changes to tests.
Simplified integration test pattern to you default failsafe plugin syntax.