#513: fix tests