Moar tests
Add expected-to-fail test
Meh-tastic fix to make hierarchy work as intended
Add another test, tweak previous for consistency.
Flesh out remaining hierarchy tests