Trying to add test cases for #352