Clean up test slightly.  Refs #552