Added 2 new tests and tweaked a few.