Get rid of more tests for weird types