Better workarounds for e2e scenarios, Closes GH-23