Some test case changes