- Add a test for non-full pools
- FIx a few related issues