Fixing unit test for FEND-805