UF-70: now tests pass isolated
UF-70: now tests pass isolated
UF-70: unit testing