Merge branch 'cc/tests-without-assuming-ref-files-backend'