WPHRT-58 Test changes