more form class test fixes