#189 #190 Correction of unit tests