More test changes after coverage check.