fix tests 557 and 561