Merge "Unit tests for CollationFa (0bfcbd724)"