More integration tests and adjustments