add testComment and testDescription
for pull
fix conflict