#589 fix tests