Re-organized integration tests