Re-arrange tests.
Added subtyping tests.