Added in rest of commented out elastic tests