Updated test form definition