Fixed UTs (follow-up for bug#9246).