SZ-111: some additions to UnitTests (not functional yet)