* Fix some cleanup in unittest