Fixes for the gluster testing