Test run improvements

@tjg can you do some review?