Tests pass again, though there is much missing.