New hierarchy using tests.
Merge pull request #37 from cauchymop/add-tests-again

New hierarchy using tests.