expand unit tests to include both nested and non-nested entities

expand unit tests to include both nested and non-nested entities #21963