Fixed infinite loop in test...