Add Element tests + fixes