Pool.add test; fix some tests