Remove about 15 seconds from test time.