Test fixes for AMD

By @hpinkos for #968 

These pass on my Windows/AMD and Mac/NVIDIA machines.