more fixes and more isolation for tests