Tortoise: oops, fix failing tests