Add fixtures and custom form type