#15 Correction of unit tests