fix format tests for golang 1.3

Map ordering is much more volatile in golang 1.3.  These tests were formerly incorrectly depending on map-order stability.

Also: Regexp.