Test elements required for Expand classes and made alterations to fix format for Expand output