Unit tests for 1074

Adds unit tests for issue #1074