Tests: Fix initial errors with all updated tests.  Ready for re-implementation.