REPORT-114 - Fixing issues; UI and test tweaks