WPHRT-58 test changes