xla

Update to clear_all, and add back test (removed in bad merge)

#4362

Merged