Added special cases to combat test.