Simplify test schema, update form_builder#label test