Automatic testing.

Code cleanup.