i'll never understand why these pass the first time then fail later. i mean, i probably will, but i don't right now. closes #5099
* +kind * rename and tidy --------- Co-authored-by: Jacob Heider <jacob@tea.xyz>