HOTFIX: Fix the tests