Abstracting some of the form type testing into a base class
PSR2 fix