minor fixes.
Fixed test break.