all fixed. Unit tests