Remove additional uses of Element from test suite.