Fix GeneralForm tests

refs #4639