Add some commented-out tests for issue #17