Add test cases for issue #58.