fixing tests after some changes