Added more integration tests.