refactoring to aspects; more UIA tests