fix tests (part1)