Fixing the tests (part 1)