Added some additional testing.