fixed some minor test code
fixed merge issue
a