Added more cases for testing