TODO updated
more integration tests