lots of cleanup from tests