Fix tests global states

Ioannis, I think you will love that one