Fix tests for issue 52.
Merge branch 'master' into structs