PSR2 fix
Adding CommentFormType and tests, updating service container configuration