Modify test running