fixing broken integration tests...