More unit tests for issue #11