UIFR-128 Fixed tests