Update to latest tests