Add some more testing. Still nowhere near enough.