PB-694 #comment fix tests.