Switch to new form class in tests