Modified tests to ensure order of execution for tests that depend on each other.