Adding tests for #604
Merge pull request #621 from bitovi/tests-update-604

Adding tests for #604