Updated tests

Tests for PR #1291