Add the remaining tests.  Fix remaining errors.