Types: expand tests