Modify grunt and test order.