sodium: cleanup, run tests