Incorporate the constructor functions from pytest code into main code

[ngraymon]

Things like _make_h_z_default_dict and _verify_connected and _verify_keys etc.

1. First order of business is just identify viable replacement areas.
2. Then later thinking about how to go about the replacement/modification etc.