Changing some tests cases