Adding more tests on integration