add new tests in integration tests
merge branch