adding form support and added test form