Clean up a couple of tests and Artifact init