Integration tests refactoring

Non major refactoring was performed for integration tests.

Change-Id: If560dc4d08411d0d0258702d48764771487d0dbc