SCV-36 Fix unit tests