make test fixes for makeflow and rh6.