#139 Correction of unit tests