Removed duplicated test case and fixed another for amd64