Refactored and enriched integration tests