Updated moh731 report

* Modified the template
* added more indicators
*added tests