more cleanup/tests