Fixes to core entity tests

Added fixes to some of the core entity tests to get them passing.