- cleanup code
- fix test, make sure all is shutdown cleanly