[591303] Part 3 made unit tests passed