merging testcases + documentation improvement