Fix failing test
Merge branch 'more-detailed-maps' into mine