- Merged PR

   - Added new test for new aggregate (more to come)

 - Fix for adding associated entity right before calling UpdateGraph.
 -Test class refactoring, getting ready for more comprehensive testing.