Added some more testing.