Fix that awful GXD test once and for all.