Tweak to master_slave and parent_child tests.