UC-1990 - some more unit tests