more pool changes + tests
wip