Fix the failed test cases
Add unoptimized test cases