add more isolation to tests, some renames