Added tests for expand for entity and lists.