[TEST] Test shouldn't keep state, so moved static variables to a context class holder which each test instantiates.