#569 fix tests