Start resurrecting the tests to match all this new work.