Fixes to e2e script

@thockin I'm changing -tests back to the way I had it, it's super annoying this way.
It was also really annoying that -build also tried to run tests, even if the cluster wasn't up.