Re-arranged test tasks.
Bit of tidying of e2e helper.
More fleshing out.