Beef up Pig integration testing

relates to #200
relates to #117
relates to #199
Improve nested map test