More complete server/client inc test scripts