elem only fixes and tests