Accompanying tests for PR #646