Updating to fix tests
Fixing tests
Merge branch 'master' of github.com:bmaxwell921/HierarchyBuilder