Fixing tests broken after merging Marco's pull request.