corrections, test are now ok