revert __convert shenanigans, add test_distpack