Expand tests to most wire types