Temp fix for failing test (tests running in mixed order)