fix ui pager
removed obsolete "todo"
fixed mocks architecture
more work on mocks integration