Update 2-0-stable tests so they at least run.

Help welcome to fix them now.