pool fixes; more tests;