BL: Fix tests