x64-upstream: Fix issue for drybuild and clean up several tests