Cleaning up RolesFormTypeTest
PSR2 fixes