Fixed some tests broken by recent code changes.