slight change
modify tests which depend on specific environment to be environment-independent