more structured query tests
adapt to 130911 planet

There is currently one failing test on deduplication due to
a mismatch in admin_levels on some highways.