Fix/3.x/21

Fix for #21 

setup() tests whether the Map Value needs to be initialised before the test starts inside a lock block.

also shutdown hz Instance after the test, it is anoying that the demo leaves the Instance running which can conflict with other demos.