Fix a couple of tests cases.