remove throwOut, modify some test cases
bugfix