Cleanup problems in unit tests