Added 2 more tests. 71/79 pass