merging test, finish 3.2.3