Tests for custom fields
Re-enable tests fixed by field fixes