Added unit test to track down issue #24