Fix test order dependency