Merge "Fix file not found in tests"