Add testelistaint, small fixes