Make JSON files honor return fields
Fix tests