Closes #2357 - Add test to show everything is working as expected
Merge pull request #2376 from simianhacker/fix-2357

Closes #2357 - Add test to show everything is working as expected