Add unit tests for issue #101