Expanded class hierarchy of Issue498Test