Fixes for UI arch and compute-resource related test-cases.

:+1: