TRUNK-4030 corrected the c:if checks and added FormFormControllerTest.xml, working on FormFormControllerTest unit test