Further improve test running