Refactored FormFillingTest