HOP-2930 Fix Unit Test