Fix tests to run under isolation