temp fix, until we fix our unit test to run in random order