Cleanup of test code and obsolete comments