fix test problems, thx @tkf