#189 #190 Correction of unit tests
Merge branch 'master' into mysql