Add an unit test for PR#34

@oza Can you review this PR?