Improvements in tests for Forms. Issue #TP410