Added a test file and unit test for previous commit 7ce2f4c98e1b72c30bd0cf48c773d20e4d7a20c3