tests minor fixes
ui mockup