Assorted test cleanup, getting my way around the code.