Ditto

Also updates to test.