Added more tests with specified type tags.