Change testing defaults

The world looks broken by our recent changes about that.

So unbreak it. We will fix our N-2 branch testing issue later.

Change-Id: I7ef45463e76a0c17c5016ca46ea4c5162e9fba49
1 file changed