WBL: Fix tests