corrected test and todos