Adds more integration tests