Minor modifications to test form