made adjustments to tests where things were created earlier in the test, and affected later tests
Merge pull request #2 from armenvartan/adjusted_test

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