HOTFIX: Commented out unit test