#24 Updated cleanup of unitests.