Minor tweaking to order of test running