optimize test and comment