More consistent formatting for jsonb tests
jsonb test cleanup for duplication and formatting consistency
Merge branch 'jsonb-test-fixes' into jsonb_and_hstore

Final clean-up for consistency