Added more variations for testing