Fixing unit tests. Part 1