HOTFIX: Update entity tests