#49 Correction of unit tests