Lay groundwork for notifyParent & notifyParent utility methods
Fix unit tests
Merge branch 'feature/40' into develop