Fix up tests, remove Done

[#82330996]