More fixes to tests based on review.