adjust tests to correspond new changes