UIBULKED-315 resolve issues missed in initial story #1660

All 159 tests pass, 1 skipped in 2m 7s

    1 files ±0   25 suites ±0 2m 7s ⏱️ -18s
160 tests ±0 159 ✔️ ±0 1 💤 ±0 0 ❌ ±0
163 runs ±0 162 ✔️ ±0 1 💤 ±0 0 ❌ ±0

Results for commit 186cdb9. ± Comparison against earlier commit 9713a6f.