Minor tests fixes.