HG-156 Fix unit tests