Fix six failing tests; add three more (all passing).