Added more items to datapool.
Fixed datapool and added testcase.