Beefed up tests and data types.