More test cleanup to converge with advent430 branch.