Add switch case statements.
Update testing cases.