Making amd64 test cases passesd 100%