Feature local server flag

replace existing (confusing) logic for starting tests locally with a simple flag
Looks like you forgot to take out the commented code?