Merge "Improve OF13 test - 2nd try"