WT-93 and last testing fixes