Fixed some tests broken by recent checkins