Merge "Fix some one handed tests failed"