Improve form collection test
Update tests report
Merge origin/master