Fixed pool translation and other logic errors, updated tests