removed some environment assumptions in tests. more to come