Type tests

mad updates to Type class