Minor fix
FIxed Unit Tests