Merge branch 'sb/test-cmp-expect-actual'