Continuing to add unit tests, revising existing ones.