Updated test environments