Handle test for all switch cases
Fix test and case for lowercase