Added test for custom fields