Updated untyped tests