change to junit 4.x format
Merge master/master
remove useless import