Improve test and try to fix a wired problem.