adding integration tests
update tests and fix integration with follow