Fix #1324
Issue #1324: Fix tests.