Code cleanup.  Start test cleanup