Test cleanup

@kevgo

Push some code into helpers and introduce a few more run helpers
Why aren't we stripping here anymore?