Tartaros: Added custom fields to test form support.