Add tests to replicate issue #1