Move CMR stuff into shared parent classes
Add tests for multiple children
Merge pull request #4103 from dimagi/opm-es

Add tests for multiple children