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