fixing bugs after tests changes