fix test coverage
Merge branch 'feature-relayout-fix' into feature-relayout
merged