Added remaining non-XML tests