Merge "Fix test pool to prevent immutability state errors"