Fixing test and exercise orders 2