#506: fix tests