UF-27: Increase test coverage for workbench modules
UF-27: compilation error fix