Enhance elt tests