Add array and map

Also include some pretty printing functions to make it easier to spot
difference between acutal and expected.