Slightly more comprehensive testing.
More testing.