EST-417: refactoring fixture orders

... in integ tests
EST-371: starting to develop fixture for tests.