Fix getKeyType() & getValType() when range Expression is a TypeName

Fix test file name Complex to complex