Expanded class hierarchy of Issue1021Test