Fixes for WafIT tests