Add some additional testing.