Fixing regression bug in test suite from new product functionality. TRAD-12 #time Fixing test suite