Enabled more entity type tests again