test and fixes