Update some cases to make the tests more comprehensive