refactor datapool
SmokeTests TC001 ready