MDL-38885 form: Fix comments and stricter unit test