Added more test only cases