fix cleanup for modulestool unit tests