Fix tests
Really fix tests
Simplify intrinsic types hookup, move some intrinsic type decls to source.