Small improvements to framework.
Improved parent_child test.
Bugfix.
Merge branch 'master' into tests
Improved master_slave test.