Improvements in tests for Forms. Issue #TP410

Improvements in tests for Forms. Issue #TP410