Add some test and fix some test