new test and fixes