Testing related form fixes