Extra test cases for lines added to protect this feature