Fixed integration tests to handle possible (acceptable) type mismatches