Completed test cases for #5