worked on improved test coverage figures and simplification of hierarchy maintenance