Interesting, it sounds like you would benefit from breaking each test out into one that focuses on a single target state.
Another layer would be conditional test execution hierarchy where one early failure would skip a set of tests that depend on that state.