test clean up, more to go