Fix tests so that they are independant when running in same process (IDE)