Merge branch 'fc/show-non-empty-errors-in-test'