Updates and unit tests for Pool & Product API