Trying to fix tests, part 3