Some edits on the type system.
[Tests] Edit tests.