fix tests: adapt them to changes in new code.