couple of additional changes to fix a minor test problem.