more test clean up