Update 3.1 map tests to reflect spec change
Cosmetic changes only