Re #1709 Finished unit testing hierarchical objects