Fixed several tests.

562/569u tests pass. All remaining failures are related to Weaver's "expected Artifact" condition.