Test cleanup.
Merge pull request #1 from arb/cleanup

Test cleanup.