more tests

merge from main