Better workarounds for e2e scenarios, closes GH-12