Change the way we start tests