Fix tests when using Go 1.3

In Go 1.3 the iteration order of short maps is random. In previous
version the order was maintained. This caused tests that rely on the
order to fail.