Merge "integration: add some new tests"