Improve tests isolation

Change-Id: I85f35b3e17b3b52eb3630cd3148ee150e1f72ee5