Minor tests corrections.