TYPECHECKING IS DONE and the examples all work; this corrects the tests. and incr