#2 Correction of unit tests