Fixes in test scenarios.

Fixed order of particular steps in tests.