Added a test and missing case