#87 Correction of unit tests...