Re #1335 Fixing tests.