update test titles, cleanup todo