PB-622 #comment fixing failed tests