Add tests for issue #15