made adjustments to tests where things were created earlier in the test,...

... and affected later tests