Unittest updates, split form into Form, IfThenElse, Question