More address field indexes, better tests.