Updated tests and data