Fixing tests (see #1093)