Cleanup of unit tests