Updated tests. Part 1 of 2+