REPORT-114 - Fixing issues; tweaking UI and test