Added more test conditions