Fixes to e2e script

@thockin I'm changing -tests back to the way I had it, it's super annoying this way.
OK, OK.  I yield