Fixing Unit Tests. Part 3