fix tests partially