Test cleanups.
Planning cleanups.