Hotfix/tests