Further improvement in some test cases. Remove From To works now.