clean up test a bit by @dreid's suggestions.