integration tests refactored