Adjust round trip test to make the state valid with the new rules
Disabled test for walking under bridges