more test cleanup

See commits.