Fix one test and resolve #49

There are still 2 others tests which not passed.