some make test fixes