5182dbc additional cleanup - my last org chart commit broke org chart, this fixes it, and cleans up some other stuff, and adds some more tests

Authored and Committed by rmeggins 16 years ago