Add multi-json and other test fixes to squeeze