#23 Correction of tests