Merge pull request #330 from mmaka1/glk-ut-fix

ut: fixed tests