Added more input cases