Simplify unittest per Kenji's comments.