6.x development release.
7.x development release.
Log back as the original user and some cleanup.
This is the first beta of simpletest automator.