Fix #490: update tests