add integration test
merge branch