Automate failing use case (still not working)

Improve UP manager slightly + small other bugs