This shows all the changes side-by-side.
I intended to keep all the original tests inline but it got harder than I expected, so I'm going to make another pass over this and insert the original tests back in later.