Adding more integration tests