Add test cases for issue #13