Update test cases for #4