[Form] Fixed failing tests