Fix tests after big damage rework

[brandonsturgeon]

I saw there were a few test failures in there after that last merge - went ahead and fixed them up 👍

Great job getting that through - that's a lot of good changes!