Updated tests and test data.