Reorganized integration tests