Fix some problem with test