re-did hierarchy to have flare.json based tests.

Updated the tests for hierarchy to have them be flare.json based as per #1888.

Not sure if the data should be inline or not.