Try to fix some test problems. It may worked