Solve test failure on rfc822/supermodel