Hygiene: Fix tests isolation

Change-Id: Iccee0eacc18333caf12a2a5e4a2ac72565ae0128