SOL-20 Fix unit and quality tests