Fixed tests by adding separate form type