minor changes to make unittest easier

No match.