Hotfix: fix unit tests