HOTFIX: Fix failing tests