#90 #141 Correction of tests
Starting development of 1.6