Minor fix for unit tests