Improve tests isolation, but it is not enough
merge