extend tests, more types