Unskip tests by preventing additional entity.error

[matthew-white]

This PR unskips tests that were temporarily skipped in #1195. See #1195 and especially #1200 for why the tests started failing and had to be skipped.

Before submitting this PR, please make sure you have:

• [x] run make test and confirmed all checks still pass OR confirm CircleCI build passes
• [x] verified that any code from external sources are properly credited in comments or that everything is internally sourced