Fixes to core entity tests

Added fixes to some of the core entity tests. Now only one or two are failing.