Integration tests refactoring