Add some more testing.