Refactored all integration tests