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

Closes #2357