Minor fix, testing improved.