Use just instead of contains
Convert test to tabular format
Remove turn type

The whole turns system needs revisiting
Use a set, dont need :in-any-order
wo: cities