(CFACT-52) Fix handling of CR in unit tests