More uniform representation of data.
More tests.