Form tester fixes