WW-4427 - cleaned up UT