fix formmaint. update test suite