UIManager refactoring + new UIMan tests