Updated tests. Part 2/2+