KD: Fixed tests