these work now
tests: more cleanup