Finished volatile parent child sync tests.
Fixes
Merge branch 'master' into tests