Add tests for issue #25