Removed old element, improved test speed