Change tests to new order