Added uiModel and test