Sort of. I restructured setup to make these tests independent of each other.