Revive entity tests 2nd try

Some cherry picking later. Again, reactivated the old test for the base classes.