Tests that were removed in PR #652 should be added back once the issue is resolved.
Tests that were removed in PR #652 should be added back once the issue is resolved.