Fixes for gres/gpu testsa

These test changes are designed to support gres/gpu configurations
where only some sockets actually have GPUs. The tests will not work
with all possible configurations, but this change will result in the
tests working in more cases.