100% coverage of forms module

These commits permit to cover 100% of forms module with a little cleaning by the way.